From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Fri, 24 Jan 2025 14:06:40 +0000 (+0100)
Subject: Merge pull request #7789 from nextcloud/bugfix/show-resolve-conflicts-dialog
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~2^2~110
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=af2027d040c29ac5ddd6ebd260379c3a5d840b89;p=nextcloud-desktop.git

Merge pull request #7789 from nextcloud/bugfix/show-resolve-conflicts-dialog

fix "Resolve conflicts" dialog not showing up
---

af2027d040c29ac5ddd6ebd260379c3a5d840b89